Skip to content

Conversation

@stevenhua0320
Copy link
Contributor

@cadenmyers13 ready for review

@cadenmyers13
Copy link

cadenmyers13 commented Sep 24, 2025

@stevenhua0320 As Simon mentioned, this is being done on getegui as well as some of your other open PRs. I believe it is possible to change the branch where this is being merged into without closing this (and the other) PRs. See if its possible to merge this into migration

@stevenhua0320
Copy link
Contributor Author

@cadenmyers13 But here's the problem. The getegui branch's file are on the dpx folder, however now in migration branch the files are all in diffpy folder(this is the folder that we want). If we solely use current commit then the level of folder is inconsistent and might create conflict. Let's redo this and close it. It should be quick to redo these operations since we know where we need to edit and how should we edit it. I have created a new PR #12 that edits on correct migration branch.

@cadenmyers13
Copy link

I see, so PR #12 has all the edits from currently opened PRs?

@stevenhua0320
Copy link
Contributor Author

I see, so PR #12 has all the edits from currently opened PRs?

No, I started from the beginning to redo the work on #3. I would create another one to do the same work as the current open PRs.

@cadenmyers13
Copy link

Okay sounds good

@sbillinge
Copy link
Contributor

closing so that we do not merge this accidentally. @stevenhua0320 the edits here will still be available in the closed PR if you need them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants